From 90227d0c34877e6f0ff9936078926c55af2e5b08 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 26 Jun 2025 07:52:20 -0400
Subject: [PATCH] jsonwrt: Integration fixups

This gets the code to build without the rest of util-linux.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 src/libotutil/.clang-format-ignore | 2 ++
 src/libotutil/ul-jsonwrt.c         | 9 ++++++---
 src/libotutil/ul-jsonwrt.h         | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/libotutil/.clang-format-ignore

diff --git a/src/libotutil/.clang-format-ignore b/src/libotutil/.clang-format-ignore
new file mode 100644
index 00000000..67b057cd
--- /dev/null
+++ b/src/libotutil/.clang-format-ignore
@@ -0,0 +1,2 @@
+# Because this is imported code
+ul-jsonwrt*
diff --git a/src/libotutil/ul-jsonwrt.c b/src/libotutil/ul-jsonwrt.c
index 365d845c..44339835 100644
--- a/src/libotutil/ul-jsonwrt.c
+++ b/src/libotutil/ul-jsonwrt.c
@@ -9,10 +9,13 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <cctype.h>
 
-#include "c.h"
-#include "jsonwrt.h"
+// The following includes were modified from upstream
+#include "ul-jsonwrt.h"
+#include <glib.h>
+#define c_toupper g_ascii_toupper
+#define c_tolower g_ascii_tolower
+#define assert g_assert
 
 /*
  * Requirements enumerated via testing (V8, Firefox, IE11):
diff --git a/src/libotutil/ul-jsonwrt.h b/src/libotutil/ul-jsonwrt.h
index f156fdd4..bddbe5ed 100644
--- a/src/libotutil/ul-jsonwrt.h
+++ b/src/libotutil/ul-jsonwrt.h
@@ -5,6 +5,9 @@
 #ifndef UTIL_LINUX_JSONWRT_H
 #define UTIL_LINUX_JSONWRT_H
 
+#include <stdio.h>
+#include <stdint.h>
+
 enum {
 	UL_JSON_OBJECT,
 	UL_JSON_ARRAY,
-- 
2.30.2